Merge "Add missing settings strings" into tm-dev am: e1bcab3b51 am: 0a10b8cc8b

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

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