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