Merge "Override map for enabling mainline module prebuilts" into main am: 08445aad am: c284f8c8

Original change: https://android-review.googlesource.com/c/platform/build/+/3109349



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