Merge "Turn on hole punch for PIP with caching" into sc-dev am: c845102567

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/14704339

Change-Id: Ia4b4af1244ebd3caa4b1023ee8d7b56d388f3232