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

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



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