Merge "Reenable the failed unit tests" into tm-dev am: b44856f4

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



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