Merge "Attempt to reduce flakiness in SimPhonebookProviderTest"