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

Change-Id: I8f8b0234ce0e0d20db778b215bf1d91fdffc01cc