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

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



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