Merge "[automerger skipped] Merge "Build com.android.media.remotedisplay with java_sdk_library" am: 1ad4aed0 am: a1bc1b13 am: 818de823 -s ours"