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

[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41b -s ours am: e43aae1c -s ours am: f737d4ce -s ours am: 34991616 -s ours

am skip reason: subject contains skip directive

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



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