[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into sc-dev am: 902b5b1d0c -s ours am: 6503057f0c -s ours am: ed9f5e70e3 -s ours am: 82d623a2b5 -s ours am: b1c0ac1498 -s ours am: 99dd2350d4 -s ours am: ea78ab0296 -s ours am: 91830c7702 -s ours

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

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

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