Fixed unit tests am: 261ce0bb am: 488a6cb5 am: 0b2823cd am: 8867ec3d am: d2ba7724

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



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