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

[automerger skipped] Merge "Restrict the overridden min size for PiP" into sc-dev am: c241755d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia5954a83e3842fa68ac6faf003be774450a4ee86