Merge changes from topic "lifecycle-udc-mainline" into udc-mainline-prod

* changes:
  Revert "Revert "Updated AnimatedContentScope to AnimatedContentT..."
  Revert "Revert "Fix Expandable.kt to work with new Compose prebu..."
  Revert^2 "Lifecycle has to use kotlin syntax"