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: 5ccf6f8d am: 8dd843f0 am: 0bd905c5

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



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