[automerger skipped] Merge "Revert^2 "Add a check for apex/allowed_deps.txt to...

[automerger skipped] Merge "Revert^2 "Add a check for apex/allowed_deps.txt to droidcore."" am: bcfaaf9e am: 058ef86a am: 3a190264 am: 060703f7 -s ours

am skip reason: Change-Id I5695dd1003386191dbbe0ea511ef5b615d0d5e4e with SHA-1 5547d84e is in history

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

Change-Id: Icc1e025136c189169eb7a7541e5dcd00e99a0e22