[automerger skipped] Merge "Include sdk versioning proto in media apex" am:...

[automerger skipped] Merge "Include sdk versioning proto in media apex" am: f0adae0b am: 665fa5a2 -s ours am: b8dcf573 -s ours

am skip reason: Merged-In I25df15ff35e004f63b2788e862df5778d21505f7 with SHA-1 8aad6e5e is already in history

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

Change-Id: Ic435f48559ad2c5939f16fe8ae78abd11aa9e8b8