Merge "Convert com.android.media.remotedisplay.stubs-gen docs" am: 0f7d0f4e94 am: ce0e551171
am: 6aabf8c202

Change-Id: Ic870e9f9b10d18b6976951e9fe08afda85270a3f