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

* changes:
  [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: 0375cc4c -s ours am: a0f46314 -s ours
  [automerger skipped] [DO NOT MERGE] Update quickshare intent rather than recreating am: 6bf13a85 -s ours am: 429b89ba -s ours am: a4b275a0 -s ours am: a94b8fcf -s ours am: 5c26e7a1 -s ours am: e6028fe6 -s ours