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

[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 02938e8c -s ours am: 4c670391 -s ours am: e44eeff6 -s ours am: 0d12b027 -s ours am: e0211ce7 -s ours

am skip reason: subject contains skip directive

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



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