[automerger skipped] Merge "Add slot based ICC channel APIs" am: e278d2bcdd am: ca075c3176
am: dc0ac4fa83 -s ours
am skip reason: change_id I3f47a8ac07813ea9e326c7d76123352708bfeea2 with SHA1 04c28872d1 is in history

Change-Id: I46448919190fa47873183d33924f0b283234ddee