Merge "Use reentry size to calculate PIP entry bounds" into rvc-qpr-dev am: 6d1ef3b45e

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

Change-Id: I09a527e6781c86e11b182375675b6dad8b120205