[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 -s ours am: 8bfea0f2 -s ours am: 3929494a -s ours am: 79f69dde -s ours am: 5eb2c406 -s ours

am skip reason: subject contains skip directive

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



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