tree 716e65cb1a078fba71ce279ef75736f21aaedfb3
parent c27abbf3e7c847fbe6e0df360655a9b73c586893
parent b4b328f272173b70935cb793aff9f591c98e252c
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> 1660943481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1660943481 +0000

Merge cherrypicks of [19419128, 19459610, 19221774] into tm-release. am: b4b328f272

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

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