Merge "Fixed a a11y regression to click notifications" into oc-dev am: b792f98446
am: 1d50b00962

Change-Id: If8b429ac7c6c57fa756ae2d4e036beb2cf2ba919