tree 0bcbd5001b75df7120774d957512692b9e65cce6
parent 80dd5dd4bda566db6351a093fce396e9e2000bac
parent 3f94b8d0795780ab49c35dda94ffe50d57e835f3
author Lajos Molnar <lajos@google.com> 1614120698 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614120698 +0000

Merge changes I4a6854ee,I12af66ef,I5b41cbe2 am: 3107a0bb93 am: 7f944c9c0b am: 3f94b8d079

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I03e58c81c70be30be2233d9d9e8365fe53025228