[automerger skipped] Merge "[Telephony] Implement PhysicalChannelConfig in HAL 1.6" am: 8f74b34e am: 41e252fa am: 96aaaaef -s ours

am skip reason: Change-Id I4352ea928a76197aae01b887960eaed05698e3eb with SHA-1 1276bc9b is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1552062

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8154df74873a9174c47167aac81265235a0d4f1c