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

[automerger skipped] Merge "Fixed unit tests" into tm-dev am: c6e50f7c -s ours am: 714387ce -s ours am: bc08e2f1 -s ours am: 828a6581 -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: Icc4365c9690dbb7d1eacb925d3a5f7d46e839a3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>