Merge changes I6991827a,I85299a83 am: e87ca15798 am: 6406b93840 am: cac3ba5c6e am: f3a8718082 am: 92c963901c

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

Change-Id: I30afaca3e4a897f75f07b3546e3e5bb931d69376