Merge "Merge "docs: Changed Android branding guidelines for clarity" into nyc-dev am: 2dbf06da2b am: 44f97c2fad am: ceb60ca1b6 am: d96efc3618" into nyc-mr1-dev-plus-aosp