Merge "Fix UnifiedEmail tests on userdebug builds."
am: f9cde871ff

Change-Id: I16a3476f33a2ea2eda8d7a7944f5c6b305e7bd02