[automerger skipped] Merge "[ANAPIC Review] Modify radio 1.6 in telephony...

[automerger skipped] Merge "[ANAPIC Review] Modify radio 1.6 in telephony side" am: 097e6df5 am: bdccf36a am: a2791577 -s ours am: 2fe30cb9 -s ours am: 84f587d5 -s ours

am skip reason: Merged-In Iaefc5d26e7d38b72d98ca5cf8f39fdae646fe916 with SHA-1 45e79843 is already in history

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

Change-Id: I9569c65794cdabb290259771af85e4359a1bd39a