Merge "Layout updates to share sheet" into oc-dr1-dev am: 2a050dae1a
am: 28e83de5ae

Change-Id: I1b2b1c459e321407475a1c68fd098d6256337371