Merge cherrypicks of [20248676] into tm-qpr1-release. am: cf251a8466

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

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