[automerger skipped] Fixed the broken tests am: e6d94eb4 am: c00df6cf -s...

[automerger skipped] Fixed the broken tests am: e6d94eb4 am: c00df6cf -s ours am: e41a1c11 -s ours am: d7ec03ee -s ours

am skip reason: Merged-In Id2c5b20d98cfba9e0ebafeb0331ebf76160640bd with SHA-1 edbd1c40 is already in history

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



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