Merge "Allow a11y listeners to specify handlers" into oc-dev
am: efb859f2af

Change-Id: Ifcee49e39f57d5991c15ebf7a2fa4f0fa3a53edf