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

Change-Id: Ie9fdfcbdd48a30ecb9d8618f96b9a5bf7ddde765