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

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



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