Merge "Update ContactsContract_Wipe#testDatabaseWipeNotification test." into android10-tests-dev