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

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



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