Merge "Add missing settings strings" into tm-dev am: e1bcab3b am: ef770da2...

Merge "Add missing settings strings" into tm-dev am: e1bcab3b am: ef770da2 am: 9cdda9dc am: 8df6c994

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17944324



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