Merge "Add missing Settings constants." into tm-dev am: ef3ac99de6 am: 543170a235 am: e120972ec0 am: bd07ce3020
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>
This commit is contained in: