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

Change-Id: I4c7c2363cea058a1b905b07826ffba5a4439f833