Merge "[automerger skipped] Merge "Build com.android.media.remotedisplay with java_sdk_library" am: 1ad4aed0b9 am: a1bc1b1331 am: 818de8233e  -s ours"