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