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

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 0da02583 am: 8f0ff7c0 -s ours am: bcfc3fb0 -s ours

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

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



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