Merge branch 'mnc-mr-docs' into mnc-ub-dev

Large merge to reconnect automerger for docs branch to mainline.

 Conflicts:
	media/Camera2Basic/Application/src/main/java/com/example/android/camera2basic/Camera2BasicFragment.java
	media/Camera2Basic/README.md
	media/Camera2Video/Application/src/main/java/com/example/android/camera2video/Camera2VideoFragment.java
	media/Camera2Video/README.md
	media/MidiSynth/template-params.xml

Issue: 28000173
Change-Id: I1fe910677f9505caeca1a6bbc7ca508c414ec839