Merge changes I8a46c5d9,I36b2aab3 am: 8bcc42eb07

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

Change-Id: Id1084ef418767fdf0ce4e387e7aec71209327b9c