[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: e1ee7ca2 -s ours am: 0486f641 -s ours am: 4e372a58 -s ours

am skip reason: subject contains skip directive

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



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