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

Change-Id: I3a3ef4076cd24cdffe939829b1da89057c0140a7