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

Change-Id: I48dd6108ec6f9a0089ca317996aa9d1d895a1b54