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

Change-Id: I5ca41ea38bfc46ed81d9319f7ce20da7e6399e0d