[automerger skipped] Merge "Add a configuration to enable or disable support...

[automerger skipped] Merge "Add a configuration to enable or disable support for repair mode" into udc-dev-plus-aosp am: 62eb14b8 am: ecc9ce72 -s ours

am skip reason: Merged-In I6217b00b488851c63f3249c74ca2b64ace29806f with SHA-1 37f2d128 is already in history

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



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