Merge "Cleanup video provider binder code." am: 398794c0a6
am: bd9bf9f9c7

Change-Id: Ia92320bb9a283c97ac81bb76dcc01975597e14be