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

Change-Id: I1243c4def83a7b116373af01dda2cb883a036e09