Merge "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox" into...

Merge "Restrict unsigned integer overflow in MPEG4Writer writeEdtsBox" into main am: dc2c40ba am: 79b888f4

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



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