[automerger skipped] Fixed telephony unit tests failure am: 894a4d09 -s ours...

[automerger skipped] Fixed telephony unit tests failure am: 894a4d09 -s ours am: 76d5d713 -s ours am: 4be8a914 -s ours am: 8dc24706 -s ours

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

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



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