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

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



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