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

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into udc-dev-plus-aosp am: 89310a6e am: cbb1f9d6 -s ours

am skip reason: Merged-In I8798f723bc821241d70fc8e5cb2c6ae59d7115af with SHA-1 2910d683 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24423378



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