[automerger skipped] Merge "Fix the flicker in the Lock screen page" into...

[automerger skipped] Merge "Fix the flicker in the Lock screen page" into 24D1-dev am: 6f6629e6 -s ours

am skip reason: Merged-In Icb7714c19ae73d15bccc9b6976a10cf343a16f53 with SHA-1 753a5565 is already in history

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



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