Merge "Merge "Scrim opacity must satisfy GAR" into oc-dr1-dev am: f98facc3b8 am: 835f5e41de" into oc-mr1-dev-plus-aosp