Merge "AOSP/UnifiedEmail -  Fix improperly formatted resource strings in UnifiedEmail."
am: f9fe78cbb1

Change-Id: Id042ed9b1300a756ce1181b37840c2db857991d8