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

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



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