Merge "RESTRICT AUTOMERGE: BUILDER_EXTRAS_OVERRIDE to false" into udc-qpr-dev am: 0fe22e8aa5

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

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