Merge "com.android.media.tv.remoteprovider is built with java_sdk_library"
am: bd83ac0ecc

Change-Id: I5f786115b1a81a6505e473dc51e82b6b14037d22