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

Change-Id: Ib1964e9082209649f7e909bc075da1a61efc2af1