Merge "Merge "Add missing Settings constants." into tm-dev am: ef3ac99d am:...

Merge "Merge "Add missing Settings constants." into tm-dev am: ef3ac99d am: 543170a2 am: fc9e10b8" into tm-qpr-dev-plus-aosp am: 865e489b

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



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