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

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



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