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

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

Change-Id: I8a7100c2a836f0e7483f1da8eed0005ce5084132