[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "media_common_types_version_bump" am: 1495f5db am: 88cab4d4 -s ours am: 617ee05b -s ours am: b12ef865 -s ours

am skip reason: Merged-In Ic4868424e03ac23cdf2edee566721c5adb420119 with SHA-1 1ee33b81 is already in history

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



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