[automerger skipped] Merge "Fixed telephony unit tests failure" into...

[automerger skipped] Merge "Fixed telephony unit tests failure" into sc-v2-dev-plus-aosp am: 30f88ff6 -s ours am: 34cbadd9 -s ours

am skip reason: Merged-In I50c92d8cbb6a77d543a70152b44efcf517da59f4 with SHA-1 94820798 is already in history

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



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