[automerger skipped] Merge "Enlarge the width of...

[automerger skipped] Merge "Enlarge the width of AudioTimestampInternal.position" am: 79e6a53b am: 1ad538d2 am: bbeb1b5f am: ba248cd1 am: d4483cf1 -s ours

am skip reason: Merged-In Id0b4ab3325b5622fddae7320516f38b3e9efbe21 with SHA-1 38736040 is already in history

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



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