[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: 4e8d93a1 -s ours am: 9628c881 -s ours am: a1c57f14 -s ours

am skip reason: contains skip directive

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



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