Merge "Change preference title if Active Unlock enabled" into udc-dev am:...

Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763 am: 898e1d95 am: a783d32a

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>