Merge "Merge "Update icon shape for Sam" into rvc-dev am: 1bad4630 am: 91cc44c3" into rvc-d1-dev-plus-aosp