[automerger skipped] Merge "Update Telephony unit tests for method change" am:...

[automerger skipped] Merge "Update Telephony unit tests for method change" am: 5490cb38 am: 6260f5e8 am: a5a6debb am: 82c36b5c -s ours

am skip reason: Change-Id Ifae93db656292a2f11f1b53f33893da6694b206d with SHA-1 8e68af16 is in history

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

Change-Id: I8b0fb812497ecec694bb938575341a4fcb36530d