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

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

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