[automerger skipped] Merge "Bump Mainline Module Version Codes in aosp to...

[automerger skipped] Merge "Bump Mainline Module Version Codes in aosp to 339990000" am: 64137143 am: 7de6c334 -s ours am: a73f2397 -s ours am: 5a3e77be -s ours

am skip reason: Merged-In I0c95e6490b50becfa49a1be2cbbd6b71f2c2ad85 with SHA-1 9870da9d is already in history

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



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