[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-dev am: 7455a41bd0 -s ours am: e43aae1c67 -s ours am: f737d4ce8c -s ours

am skip reason: subject contains skip directive

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

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