[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 skip reason: Merged-In Icad3d5f939fcfb894e2038948954bc2735dbe326 with SHA-1 6bf13a85 is already in history

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



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