Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs
am: e293ff3bf1

* commit 'e293ff3bf12f5e215d0d6d5e21fa2315ba4d9fdb':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: Ib62978421d147abf1afaac1e6640a91324fd328e