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

[automerger skipped] Add a configuration to enable or disable support for repair mode am: 2771887b am: 4134bef1 -s ours

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

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



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