Merge "Remove proguard_compatibility opt-in from cdm_snippet_legacy" into main...

Merge "Remove proguard_compatibility opt-in from cdm_snippet_legacy" into main am: f277025b am: 18c488a8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3442761



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