Merge "Add com.android.media.tv.remoteprovider api files" am: 295497700b
am: befcf04912

Change-Id: I73681cb51e4d63669db5cc4872427cc526be543c