[automerger skipped] Merge changes from topic "aosp-mock-modem-cts" am:...

[automerger skipped] Merge changes from topic "aosp-mock-modem-cts" am: a16b1ab3 am: 6c61032e am: 4531016e am: 0cd5adab -s ours

am skip reason: Merged-In I2ee6cd5814fc572f9aa914cf496fae99d411e301 with SHA-1 7fc4d11e is already in history

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

Change-Id: Ibbd6744660d2d8dd335175ce08bb079660f855c7