Merge "Extend previously added limits for listeners" am: 875e6cc3

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



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