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

[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 589ce390 -s ours am: e62b1483 -s ours am: 1abe82a0 -s ours am: ba47bb1f -s ours am: 0d4184a1 -s ours

am skip reason: subject contains skip directive

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



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