[automerger skipped] Merge "Fixing failures in...

[automerger skipped] Merge "Fixing failures in CtsSimPhonebookProviderTestCases" am: 4671b287 -s ours am: 2f53b0c5 -s ours am: 9bbfebc7 -s ours am: 6004579d -s ours

am skip reason: Merged-In I0d794ad4e05d9ef1277136f447bc6ca3878127f5 with SHA-1 b690910b is already in history

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

Change-Id: I890fe1f7a685794c9c5f1b0d044cf24d61fe789f