Merge "Update the FlashNotificationsPreferenceFragmentTest to return correct metric category"