[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: 97299bcd -s ours am: e5b11de6 -s ours

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

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

Change-Id: I9887c881a5f733fb2d007958b177303485b6d2b9