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

[automerger skipped] Merge "Revert "Adding EXTRA_ALLOWED_DEPS_TXT config for non-mainline deps"" into main am: 0bcbebc0 am: 4ed364bf -s ours

am skip reason: Merged-In Ifd3baa7b7a14947200a614256191fe1741875427 with SHA-1 8d422a74 is already in history. Merged-In was found from reverted change.

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

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



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