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

Merge "Add missing Settings constants." into tm-dev am: ef3ac99d am: 543170a2 am: e120972e am: bd07ce30

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



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