[automerger skipped] Merge "Move proto messages from enums/ to message/" into...

[automerger skipped] Merge "Move proto messages from enums/ to message/" into sc-dev am: 914b4a37 am: f391c058 am: 5b132a12 -s ours

am skip reason: Merged-In I21acc5ff1296d5ed6f5fcbea67a82d11bb037337 with SHA-1 6bc11fb5 is already in history

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

Change-Id: I7a36769d0c3fe57afaaa46ce2f75f24141ac81e2