Merge the 2019-10-05 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  AOSP/UnifiedEmail - bug fix to composing messages.

Change-Id: Ib70f4a0fb0795539941bbc09e2206b436999558b