Merge "Change total sample count type to 64 bit" into tm-dev am: 85a25fc5...

Merge "Change total sample count type to 64 bit" into tm-dev am: 85a25fc5 am: bc2261f9 am: 94560b2d

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



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