Merge "NuPlayerDrm: explicitly use 32-bit subsample sizes" am: 50520aa539

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

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