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

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



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