[automerger skipped] Merge "Fixed telephony unit tests failure" into...

[automerger skipped] Merge "Fixed telephony unit tests failure" into stage-aosp-master am: 0d9db89a -s ours am: b712d729 -s ours am: d28b058f -s ours

am skip reason: Merged-In I50c92d8cbb6a77d543a70152b44efcf517da59f4 with SHA-1 d870462d is already in history

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



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