am 8a90866a: Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev
am 8a90866a: Merge "Correct issues with VideoProvider discovered via CTS tests." into mnc-dev

* commit '8a90866a9a70b8610035f38c610585b945ae0871':
  Correct issues with VideoProvider discovered via CTS tests.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base