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

[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 573d31ef -s ours am: 35ca651b -s ours am: 7edfbfa6 -s ours am: 750ce4bb -s ours am: 527d02d9 -s ours

am skip reason: subject contains skip directive

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



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