am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"
am d2fb6e99: Merge "Fix Issue #35489: drm content corruption on GB"

* commit 'd2fb6e99bda1ae607b5dfbb68905030f2133f8e8':
  Fix Issue #35489: drm content corruption on GB

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