tree b8c6d718838ba8a50378aa94a51169b39844bf35
parent b5c3948459bf9bc15ad6341660c17bfe825f703a
parent a3bb6da1eb95b40efbe3aa3c54d632d8969e2542
author Treehugger Robot <treehugger-gerrit@google.com> 1594944233 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594944233 +0000

Merge changes I90bb3d16,I38824d04,Ie6f6709d am: 2d87e445d5 am: 4ec440d3eb am: a3bb6da1eb

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

Change-Id: Ie89d1048bbef95f805c1ca446fa98d406bd06f29