[automerger skipped] Merge "Restrict the overridden min size for PiP" into...

[automerger skipped] Merge "Restrict the overridden min size for PiP" into rvc-dev am: 2ed6d389 am: 31a836e6 -s ours am: d3e907bf -s ours am: ab319802 -s ours

am skip reason: Merged-In I2f0dfd9a79049aaf696fde8703994deaecce63f5 with SHA-1 aad7fdc4 is already in history

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

Change-Id: Id3a2b61782cf692555af99bd4a8526c51aba8cc4