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

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

Change-Id: Ieb36dc75214be9dc1f360cdf9a2b02e0f0e5bf14