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

[automerger skipped] Fixed telephony unit tests failure am: d870462d -s ours am: 96a5188c -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: I6f911f492ecabff9edda91ab4171375882ce640d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>