[automerger skipped] Merge "[PhysicalChannelConfig] Deprecated getChannelNumber and implement relevant API" am: e61da845fa am: 388fa199cc am: db3611e6ec -s ours

am skip reason: Change-Id I44101653659d2b5d593a2b06be6567e0d0ef433f with SHA-1 37f308b9bb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e3e5a4eb88567984b6cada5c8831bf8381b9523