Merge "Merge "Fixed a a11y regression to click notifications" into oc-dev am: b792f98446 am: 0b9efc26f8" into oc-dr1-dev-plus-aosp