[automerger skipped] Merge "[PhysicalChannelConfig] Override...

[automerger skipped] Merge "[PhysicalChannelConfig] Override PhysicalChannelConfig of HAL 1.6" am: 2582fc4e am: 9e1c1326 am: ffd2d173 -s ours

am skip reason: Change-Id I86025ba8fc0dc04f1c2a5d39be5d9bff920dbe45 with SHA-1 8d785ea3 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1552235

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19951d3a5093a0c37adbf03b6924b731de73858f