Merge "Disable NotificationLoggerTest if the NotifLiveData refactor flag is on" into main