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

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



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