[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-dev am: 4ef79c3ff3 -s ours am: 79506b053f -s ours am: 279a0e4fe9 -s ours am: e5e37a13ee -s ours

am skip reason: subject contains skip directive

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

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