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

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

Change-Id: I2cc0383575a5152159bab7f9b48b39aa147877b2