[automerger skipped] Merge "Action chips in share sheet. (DO NOT MERGE)" into qt-qpr1-dev am: 3b179167af
am: 41ee7fa049 -s ours
am skip reason: subject contains skip directive

Change-Id: I9b8f5df7d80cec3778c7f481709dd1f933cd7ad8