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

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



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