Merge changes from topic "punch_holes_apk" into main am: b402f570f2

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

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