Commit a6d107c0 authored Aug 25, 2020 by Treehugger Robot Committed by Automerger Merge Worker Aug 25, 2020

[automerger skipped] Merge "Merge stage branch to development trunk." am: 512ee597 -s ours

am skip reason: Change-Id I2e897306b4c010377222b413f22357b8d3e9765f with SHA-1 877cc2b7 is in history

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

Change-Id: I7ad0f1594a56181e584a01ca1c27223e55d326b3

There are no changes