[automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into tm-qpr-dev am: e50c056eed -s ours am: 8bfea0f20b -s ours am: 0109af6828 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23474144 Change-Id: Ie6a0b33b8454312a36e2deed01231f4860060382 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: