Merge "Update quickshare intent rather than recreating" into udc-dev am: ef79a82f am: 8f26affa

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



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