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

Change-Id: I9c9a20d046c3dce3b107903229a570db59c8a51d