Merge "Fixed telephony unit tests failure" into tm-dev am: d3f3058c

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



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