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

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



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