Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
am: a783d32ab1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141 Change-Id: I5b9024876a444a1bf62974f72132a34ac9010f11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: