Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d am: 96bef3b385 am: b2c38abe48

Change-Id: I7865fa82c7e61aa6b1317db465295ab6efa7f5a1