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

Change-Id: Ib28e40aeaf7ce06a729a499c1143711cea55c1e0