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

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



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