[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "media_common_types_version_bump" am: 29e60dca am: 76bac9b9 -s ours

am skip reason: Merged-In If5a96c05b6448b588aa6326225dc6962ca7da6c7 with SHA-1 9b9ce2a4 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2203459



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