Merge "Revert "Fix NotificationManagerServiceTest to properly use DeviceConfig API with shell permission""