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

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



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