Merge "UnifiedEmail: Fix proguard rule."
am: 527a7e9048

Change-Id: I7729862a49ec2388430ab2e801361b90910b8542