Merge "Fix MIME type of non-plain text share intents" into tm-qpr-dev am: 6118cfd1 am: 24e0f524

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19939978



Change-Id: Ibbe38ea3fd639525b5f9b619cdf00d50fae6c6e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>