Merge "Update restricted setting dialog, unlock toast, and menu strings" into tm-dev am: d84516dd28 am: 6567cca4b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024 Change-Id: I0d328ded10d7db7c263b8f0697a258c30f673306 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: