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