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

Change-Id: I17d99afb4039243ff397ec489de7d77cd4cd7e4c