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