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

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



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