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

Change-Id: I0c0394da7aa1edef53db8152415788d2c70ebbb9