Merge changes I6991827a,I85299a83 am: e87ca15798

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

Change-Id: Ia6606d70e034310aa57474f8ad6eb5437522cb51