[automerger skipped] Merge "NuPlayerDrm: explicitly use 32-bit subsample...

[automerger skipped] Merge "NuPlayerDrm: explicitly use 32-bit subsample sizes" am: 14c979e8 -s ours am: 0da19291 -s ours am: 1696f1d3 -s ours am: 6446ad31 -s ours am: 16d11b7b -s ours

am skip reason: skipped by user robertshih

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2165782



Change-Id: Iad3a4da0d21f7dded958d197501cbd6b5bcdeefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>