RESTRICT AUTOMERGE: BUILDER_EXTRAS_OVERRIDE to false am: d96aa362a7 am: c698c2209f

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

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