[automerger skipped] Merge "[DO NOT MERGE] Impose a threshold on the number of...

[automerger skipped] Merge "[DO NOT MERGE] Impose a threshold on the number of attributed op entries returned in a binder call" into tm-dev am: abf5add0 am: a83946f7 am: 563c5053 -s ours am: 97bc1fff -s ours am: 1e95f0b9 -s ours

am skip reason: contains skip directive

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



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