Merge "Merge "Tweak Sharesheet DS icon rendering to ignore system shapes" into rvc-dev am: f6793af032 am: 5722d5f2c4 am: 1db2e60d38" into rvc-qpr-dev-plus-aosp