[automerger skipped] Fixed unit tests am: ea09d081 -s ours am: 8c4c185c -s...

[automerger skipped] Fixed unit tests am: ea09d081 -s ours am: 8c4c185c -s ours am: cb19c9e4 -s ours am: b8e7870f -s ours

am skip reason: Merged-In I55c19a40d3bbf0952340e5486434d302e88e9b44 with SHA-1 261ce0bb is already in history

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



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