tree 2d74bb43eb6046e58708190317497354f4b548dd
parent 3b7adf6c79e15cb78d31a63080f2a8a25f9d49c4
parent b9e1064c332c11973c68f20f8f7547e502dcf733
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1667830050 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1667830050 +0000

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>