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

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



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