[automerger skipped] Merge "Fixed flaky unit tests" am: 623383df am:...

[automerger skipped] Merge "Fixed flaky unit tests" am: 623383df am: 904f511d -s ours am: 58e652a8 -s ours am: 7c9678f9 -s ours am: 6a6336ab -s ours

am skip reason: Change-Id I17edeb7fe98f9bd412fd99dd4e024847eff1a0c8 with SHA-1 d8e77cfe is in history

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

Change-Id: Ie0db8a786590a4b387a75a7648b0d40a0347ce30