Merge "Update quickshare intent rather than recreating" into udc-dev am:...

Merge "Update quickshare intent rather than recreating" into udc-dev am: ef79a82f am: bd356a10 am: c70cf859 am: 7c3741a1

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



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