Merge "RESTRICT AUTOMERGE: BUILDER_EXTRAS_OVERRIDE to false" into udc-qpr-dev am: 0fe22e8a am: 78500a9a

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



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