Merge changes from topic "am-f07ece69339246839591a89404340826" into udc-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Update quickshare intent rather than recreating" into sc-v2-dev am: 65114fdd -s ours am: d61976d3 -s ours am: 9f765082 -s ours am: e2781f5e -s ours am: 16c266e0 -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 1d364395 -s ours am: 57ffc120 -s ours am: e1ee7ca2 -s ours am: 0486f641 -s ours am: 4e372a58 -s ours