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

Change-Id: I3867c68011003c5b0c1db4876ba78ae8dfb26910