Merge "Attempt to reduce flakiness in SimPhonebookProviderTest" am: cc5b486b33 am: 379f0d774a am: 27ed04fce4 am: 3a2ff5b05d

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1773525

Change-Id: Ic4a3683990716291c52b135c24918c876f5ef3eb