Merge "Sets BUILDER_EXTRAS_OVERRIDE flag default true" into udc-qpr-dev am: b4391f01

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



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