[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into...

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-qpr-dev-plus-aosp am: a25e5e2e -s ours

am skip reason: Merged-In I5dc415ec6b59fe56c51844473a9cb2757eeb89c3 with SHA-1 2496e082 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24393557



Change-Id: I8a2d1c0210ec9a810aaf4480c1d36155fef4c58e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>