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

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



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