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

Change-Id: I52206e80556a0a407eabce27023277a5beb76150