Merge "Docs: Fixed one of the addListener() links am: 33a1ea297d am: ba86350c63 am: 51487f06f9 am: 5c6b53223c" into nyc-mr1-dev-plus-aosp