[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: aec33803 am: b32e9192 -s ours am: c1150bd0 -s ours

am skip reason: Change-Id I2f0dfd9a79049aaf696fde8703994deaecce63f5 with SHA-1 2a18b15d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I013bd21fb2131a8d2aff089fff6be171112f05e8