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

Merge "Add missing settings strings" into tm-dev am: e1bcab3b am: 0a10b8cc am: 63541eab am: ef865e66

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



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