Merge "Split setSystemSelectionChannels" into rvc-dev am: ca8c810a9d am: 9994e07450

Change-Id: I26cb61e89a2acc71866d64b7bcd613f468e502eb