Merge "Reenable the failed unit tests" into tm-dev am: b44856f4 am: 4a206f41 am: 31ea5469

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



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