[automerger skipped] Merge "Fixed unit tests" into tm-dev am: c6e50f7c am: f0e1c6de -s ours

am skip reason: Merged-In I55c19a40d3bbf0952340e5486434d302e88e9b44 with SHA-1 261ce0bb is already in history

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



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