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

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

Change-Id: If8d33d6fd605bd49ab994ed3c1099ef2efeb6a2d