Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API" am: e61da845fa am: 388fa199cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I627f91a65c853537bc4ddd4f01c34e8ef59a9aa6