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

[automerger skipped] Merge "Remove ExperimentalLifecycleComposeApi" into aosp-main-future am: 7bed4aad -s ours am: d783537f -s ours am: a5a031f9 -s ours am: a73a6376 -s ours

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

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



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