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