[automerger skipped] Merge "Merge "Extend previously added limits for...

[automerger skipped] Merge "Merge "Extend previously added limits for listeners" am: 875e6cc3 am: 5fb1885e" into tm-qpr-dev-plus-aosp am: 706b1c46 -s ours am: a5a16d53 -s ours

am skip reason: Merged-In Ie231d7d2bc217bf1d373f8447f5f2f672c8ab908 with SHA-1 1b5369b5 is already in history

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



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