[automerger skipped] Merge "Adding EXTRA_ALLOWED_DEPS_TXT config for...

[automerger skipped] Merge "Adding EXTRA_ALLOWED_DEPS_TXT config for non-mainline deps" into main am: ec0fccfb am: ce1b840c -s ours

am skip reason: Merged-In Ifd3baa7b7a14947200a614256191fe1741875427 with SHA-1 8d422a74 is already in history

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



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