[automerger skipped] Fix the flicker in the Lock screen page am: 33aba0a6 -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: Id41103b79fca0c56aff8f2e42e6366b12c51ab6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>