Merge changes from topic "media_common_types_version_bump" am: 29e60dca

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



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