Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-qpr-dev am: e50c056e

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



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