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

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

Change-Id: I7677af171a2b22a3be2ea6b7a02dfd31b4c28f5a