[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: 0da99117 -s ours am: 681d561a -s ours

am skip reason: Merged-In Icad3d5f939fcfb894e2038948954bc2735dbe326 with SHA-1 573d31ef is already in history

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



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