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

[automerger skipped] Merge "NuPlayerDrm: explicitly use 32-bit subsample sizes" am: 14c979e8 -s ours

am skip reason: skipped by user robertshih

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



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