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

Merge "Revert^2 "Fix binder error when an app has many channels"" into tm-qpr-dev am: c8d7e101 am: 03cee857

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



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