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

Change-Id: Ic357786b8e59c144a88ee1fd5e65271b4a108b2c