Merge "Docs: Cleanup of Preview language in Android 7.0 docs." into nyc-dev am: fe060d3f37
am: df9659a112

Change-Id: If254ebcc7e0636bf95626475495e868b65cc922b