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

[automerger skipped] Merge "Rate limiting PiP aspect ratio change request" into tm-dev am: 4734d183 am: e2c60028 am: 32d1f40a -s ours am: e078af98 -s ours am: 2af375b7 -s ours

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

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



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