Merge "Flag punch hole changes with build time flag" into main am: f647719c am: 21fad8d4

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



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