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

Change-Id: Iceb97e8697ff0be054cda27e83bef091f11fd9f7