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

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

Change-Id: I3111ed8912442b7e6a072b3fc24aeab965de1b5a