Merge "Update restricted setting dialog, unlock toast, and menu strings" into...

Merge "Update restricted setting dialog, unlock toast,  and menu strings" into tm-dev am: d84516dd

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17352024



Change-Id: I73e283157c8e56d6e35464e67bb8250d7caf5e31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>