Merge "Revert "Add test case testRawContactsChangeNotification""