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

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

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