[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 skip reason: skipped by user robertshih

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



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