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

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



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