Merge "Add missing settings strings" into tm-dev am: e1bcab3b am: 0a10b8cc am: 28218e2b

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



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