Merge "Merge "Disable mediacodec.policy for riscv64" am: d69e9fa3" into...

Merge "Merge "Disable mediacodec.policy for riscv64" am: d69e9fa3" into stage-aosp-master am: 22db3d5c am: 673c81eb

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



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