Merge cherrypicks of [19418348] into rvc-platform-release. am: dd4125beeb

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

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