[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: 4a73287f -s ours am: 70064755 -s ours am: da37135e -s ours am: a27fdd4f -s ours am: cb9ca50d -s ours

am skip reason: subject contains skip directive

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



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