[automerger skipped] Merge "Fix CarrierApiTest#testOpportunistic CTS case...

[automerger skipped] Merge "Fix CarrierApiTest#testOpportunistic CTS case failure" into main am: d2d5a507 am: cc318984 -s ours

am skip reason: Merged-In Iba4b001da7f13f5adef27a6c24ab48981c959c3f with SHA-1 4d36eb99 is already in history

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



Change-Id: Idb515fc4c324d07ff37efabb54125040d71a6ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>