Merge "[Telephony] Remove getChannelNumber from SDK" am: cadc1f6086 am: b5dfa219ba am: 7c32a3f599

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1687486

Change-Id: Idfd940eff40c0b485bee00603258555101d1309e