Merge "Merge "Darken notification scrim" into rvc-dev am: f1ed02a5 am: d06a7daa" into rvc-d1-dev-plus-aosp