Merge "Merge "Merge "docs: Added Sony Xperia Z3 as a testing device for Android N." into mnc-docs am: 8262d9c00d am: 4af01c1aec am: 2c98879a27 am: 2ebb73e557" into nyc-dev am: 4465e8d6e6 am: d70568065b" into nyc-mr1-dev-plus-aosp