Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26

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



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