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

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-dev am: 902b5b1d -s ours am: 6503057f -s ours am: ed9f5e70 -s ours

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

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



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