[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather...

[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-qpr-dev am: e50c056e am: b82da040 -s ours am: 004601d5 -s ours am: 30c2386b -s ours am: a7a62b34 -s ours

am skip reason: subject contains skip directive

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



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