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

Change-Id: Idebc4fa9cb0b2512043b0aa817a96926ec0a0d2a