[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "media_common_types_version_bump" am: e38b08ad am: 5a6670a9 -s ours am: 357625c6 -s ours am: 428ceeb2 -s ours am: bc63892f -s ours

am skip reason: Merged-In Ide6a90716bf042fbb925357e110bc84ddb9e96fb with SHA-1 d38e3f0d is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2203398



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