Fixed the broken tests am: edbd1c40 am: 72ccebfc am: e61d0b74 am: 9b9b46c7

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



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