tree d31ea6636bcb553e183815b3eb656115a5528cee
parent 9d7f7b24f19bd0fad8e4406cd1be11ec912ff84e
parent 2f46995e571146932b3b9872947ffe8ba8e9450a
author Phil Burk <philburk@google.com> 1593275694 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593275694 +0000

Merge changes I742a9d3d,Idce40ad2 into rvc-dev am: 1928cddbe9 am: b167113505 am: 2f46995e57

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

Change-Id: Id4ebbc236b4b8e16a4e7cf5b4c95a63b3e75df43