Merge "Revert "Fix binder error when an app has many channels"" into...

Merge "Revert "Fix binder error when an app has many channels"" into tm-qpr-dev am: 517d2b22 am: 503172d4

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



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