Merge "Build com.android.media.remotedisplay with java_sdk_library" am: 1ad4aed0b9
am: a1bc1b1331

Change-Id: I4fff5350c7ae997f5db3f2e3b88bec8bdbe53d90