[automerger skipped] Merge "Add support for setSystemSelectionChannels" am:...
[automerger skipped] Merge "Add support for setSystemSelectionChannels" am: 9f0afd7a am: 75712bff -s ours
am skip reason: Change-Id I2dcffb3e5100cb4bfac23e82c9b26fa42c2d5c31 with SHA-1 f75ba447 is in history
Change-Id: I6477b2ae4180ab29acddcef1b00c091c681b98b4