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

Change-Id: I391a1f1ba2a5b6f3dbb7e391ff89f29415c6d751