Merge "Flag punch hole changes with build time flag" into main am: f647719c2c

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

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