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-dev-plus-aosp am: 62eb14b8

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



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