Merge "Add support for setSystemSelectionChannels" am: 05c4fe58e9

Change-Id: Ia73eab0c58f837c530a07cc6470c82853a27229b