RESTRICT AUTOMERGE: BUILDER_EXTRAS_OVERRIDE to false am: d96aa362a7

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

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