Revert^3 "Fix binder error when an app has many channels" f6d322577af7231c28d398096b3ca9b88260fa49 Change-Id: Ib42bf11c154e287119a5af0a4f92510cfb3a6cc7