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

Merge "Merge "Add missing Settings constants." into tm-dev am: ef3ac99d am: d8e63ca3" into tm-d1-dev-plus-aosp am: d04e8d8d

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



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