Merge "Revert "PiP: Recalculate size if too big/small on display change."" into sc-v2-dev am: 7b5857e2e3

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

Change-Id: I7168c520763b2aabb9f726e829269cfca89d2f3a