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: 57c7dd97

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



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