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

[automerger skipped] Merge "NuPlayerDrm: explicitly use 32-bit subsample sizes" into tm-qpr-dev am: 6ca7e5d7 -s ours am: 37a861aa -s ours

am skip reason: Merged-In Ib8478eeae87340b6c90724286bea9a9c18dc7795 with SHA-1 6662aed5 is already in history

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



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