Merge "Add a configuration to enable or disable support for repair mode" into...

Merge "Add a configuration to enable or disable support for repair mode" into udc-qpr-dev am: 9287b2a2

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



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