Merge changes I3929bfb6,I4ad6fa07 am: 632056e550 am: bf13fc87b0

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

Change-Id: Ifa926ce9e8580095a9d1738a3c02c88d273ac1b1