Merge "Fix link-type check warning on com.android.media.remotedisplay"