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: Idbe7fcf747a8795927c109e1646d404e963d0202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>