[automerger skipped] Merge changes from topic...

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

am skip reason: Merged-In I9dcd786fe921c6ed4ac49bba5a6dddf887404df3 with SHA-1 12030279 is already in history

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

Change-Id: I8bdea700236caacbbb528554a83833175071510a