Merge "Convert com.android.media.remotedisplay.stubs-gen docs"