Merge cherrypicks of [19536772] into rvc-platform-release. am: b9e1064c33

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

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