Merge "Fix UnifiedEmail tests on userdebug builds."