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