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

[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-dev am: 4ef79c3f -s ours am: 79506b05 -s ours am: 279a0e4f -s ours am: e5e37a13 -s ours am: db63c92b -s ours am: ee690f98 -s ours

am skip reason: subject contains skip directive

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



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