[automerger] AOSP/UnifiedEmail - bug fix to composing messages. am: 8c19e4f8fa am: 09976e5356 am: fabc43ef7e am: 93fc485022 am: 62c0cea734 am: 16addb8f66 am: 3aef2f2371
am: bf3bb73e90

Change-Id: I3986a5c4f52a92c632d4a1710fe5952e2b66e5ae