Merge "Fixed unit tests" into tm-dev am: c6e50f7c

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



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