[automerger skipped] Merge "Rate limiting PiP aspect ratio change request"...

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-qpr1-dev am: 19b654c1 am: a8eefa3b -s ours am: 1e570c5d -s ours am: eff5ae9d -s ours am: 864c1365 -s ours am: 38ce872d -s ours

am skip reason: Merged-In Icb7dd17bbf7df573a9bb28f3dc56e90e78384f4f with SHA-1 8d814cc3 is already in history

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



Change-Id: Ie2f562b66d512495a151744981d25424fd58b026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>