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: Ie38e7c1f54b00b09f2230a136be2ddfe82298c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>