[automerger skipped] Merge "Treat allowlists differently for flattened apex"...

[automerger skipped] Merge "Treat allowlists differently for flattened apex" am: 94651571 am: dd04a0cb -s ours

am skip reason: Merged-In I1971a686aa111b396f9e694a74be70d758078423 with SHA-1 fd1c87c0 is already in history

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



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