Merge "Add Settings.Global keys for Dsrm plus feature" into udc-qpr-dev am: 8df6d8c7

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



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