Merge "Duration field is 64 bits" am: 2144f9bd55 am: 5fe851abe9 am: d331dc3a64 am: 796be66410

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

Change-Id: Ic69e0c222cf62922f222b84e01ae37e3124389a7