Merge changes from topic "ignore-vendor-apex-allowlists" am: a22612eb94 am: 8ceedbd375

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

Change-Id: Ida1d994bb0f24f7a8f83bf1fef47d41457b243d1