[automerger skipped] Merge "Use reentry size to calculate PIP entry bounds"...

[automerger skipped] Merge "Use reentry size to calculate PIP entry bounds" into rvc-qpr-dev am: 6d1ef3b4 am: 0278513d -s ours

am skip reason: Change-Id I0bbb4725c249d9d81b80b46d1bff5d6cd11981c3 with SHA-1 4177a5ee is in history

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

Change-Id: Ice66622ec9f05d324120a952a6fd94aa7daecf8a