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

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

Change-Id: I841fba8b27bff32fbe006192c093e43701662750