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

Change-Id: Ie8774e8a5d9c4c0ab417a9294c1efd1a3ee6ade3