[automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 02938e8cca -s ours am: 4c6703914d -s ours am: e44eeff64c -s ours am: ae6495ad7b -s ours

am skip reason: subject contains skip directive

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

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