Merge "Merge "docs: Fixed code snippet in notify-user/navigation.html am: 32cc6b7fb7 am: c89c8c3e37" into nyc-dev-plus-aosp am: d604595820" into nyc-mr1-dev-plus-aosp