Merge "Fix title of no-screen-lock notification" into udc-dev am: c0c0edd078
am: 1e7990341c
am: ca64a03ef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061496 Change-Id: I1d29c135ed303c11fa76ccf6efa3173b48b195c8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: