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

Change-Id: Ifc20898208dae803037a3c322bea785e6d82926e