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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6ae13659696ccfea9fc7fa06be0a70d659e056da