[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than...

[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 1d364395 -s ours am: 57ffc120 -s ours am: 8d3fa507 -s ours am: f38a555f -s ours am: ecb49a12 -s ours

am skip reason: subject contains skip directive

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



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