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
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 37cb789..ab60e55 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -171,9 +171,9 @@
 
     private static final String MAIL_TO = "mailto";
 
-    private static final String EXTRA_SUBJECT = "subject";
+    public static final String EXTRA_SUBJECT = "subject";
 
-    private static final String EXTRA_BODY = "body";
+    public static final String EXTRA_BODY = "body";
     private static final String EXTRA_TEXT_CHANGED ="extraTextChanged";
 
     private static final String EXTRA_SKIP_PARSING_BODY = "extraSkipParsingBody";
@@ -189,9 +189,9 @@
 
     // Extra that we can get passed from other activities
     @VisibleForTesting
-    protected static final String EXTRA_TO = "to";
-    private static final String EXTRA_CC = "cc";
-    private static final String EXTRA_BCC = "bcc";
+    public static final String EXTRA_TO = "to";
+    public static final String EXTRA_CC = "cc";
+    public static final String EXTRA_BCC = "bcc";
 
     public static final String ANALYTICS_CATEGORY_ERRORS = "compose_errors";