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

Change-Id: Idc1ff7ed64dd0c6fa70e39c14ca97cd174e58a84