[automerger skipped] Merge "[Telephony] Fix test fail in...

[automerger skipped] Merge "[Telephony] Fix test fail in PhysicalChannelConfig" am: 88029d00 am: be31ba82 am: b6a15e33 -s ours am: 301d9863 -s ours am: afec8576 -s ours

am skip reason: Merged-In I7e004e660f5a89edd3c026d466de0d40adaa8af7 with SHA-1 91126ffd is already in history

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

Change-Id: I6387f458fbc817b5df5ac445cbb2611192e669a8