[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-SupportedContentType-myxl3uejg2" into tm-mainline-prod am: e2a11cc7 -s ours

am skip reason: Merged-In I4370354dc505227ae1b5e71a6b691828f4a73bf6 with SHA-1 06a2bab1 is already in history

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

Change-Id: I6a45418f2496396676a286391863339c00835621