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

Change-Id: Iebbd1ca4cfef3849cda5ecb8f97b3246403249e4