Merge "Fix flicker of “touch to unlock anytime” toggle" into udc-dev am: 2b44fc26d1 am: 340a0870d7 am: 341e8f5cf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898825 Change-Id: If44c7fd3261611dd979fbf4f9380763d1a04cef8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: