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

[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-qpr1-dev am: db528155 -s ours am: 3f204c4a -s ours am: 64301a2c -s ours am: 4bd0fede -s ours

am skip reason: subject contains skip directive

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



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