[automerger skipped] Merge "Implement codec capabilities enforcement." into...

[automerger skipped] Merge "Implement codec capabilities enforcement." into udc-dev am: 4c2a16c7 am: 8948af18 -s ours am: 58459f6e -s ours am: 17a7b835 -s ours

am skip reason: Merged-In Ia3f026c6b604704e5bcff42e17a5f4fc6c7767c5 with SHA-1 10822e63 is already in history

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



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