Merge "Add a settings key to expose the device's repair mode state" into...

Merge "Add a settings key to expose the device's repair mode state" into udc-qpr-dev am: 03dfedbc am: 6951c810

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



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