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

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



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