Merge "Attempt to reduce flakiness in SimPhonebookProviderTest" am: cc5b486b33 am: 379f0d774a

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

Change-Id: I4b0f66ac50f9f6e0d4462e16b17ba880779b590c