[automerger skipped] Merge "Detect system_ext provenance for APKs-in-APEX" am:...

[automerger skipped] Merge "Detect system_ext provenance for APKs-in-APEX" am: 66fadd90 am: 618d74c5 am: 43b384ef am: 3f924d04 -s ours

am skip reason: Merged-In I690618727ebf9a61f07b3925b30e7631d33c4e8e with SHA-1 abf29541 is already in history

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

Change-Id: Ifbffb7ac9d1a533891d6743a212dfa158fdf6132