tree e1fc16beeb305bff688a53317441b5b30699e6ee
parent 01de790c4f4d837471f7cb76558a5726382ba5a0
parent b16711350551e228392697e9b715b99098323d8c
author Phil Burk <philburk@google.com> 1593223440 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593223440 +0000

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

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

Change-Id: I7eb8ff6b8e165a374e8deae65bfd6a3f683d15c3