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

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

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



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