[automerger skipped] Merge "Fix request for getSystemSelectionChannels" am:...

[automerger skipped] Merge "Fix request for getSystemSelectionChannels" am: 27614a5c am: 29d5f990 am: a3bb156a -s ours am: b2ae8f43 -s ours

am skip reason: Change-Id Id995b7519b76243b2d1824fb01b4cd4269742bc3 with SHA-1 da0b407f is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1595294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I771349bf5ab1beb933ad48b8727720b64e615a79