Merge changes I597f7405,I09b65692 am: d68b9c594e

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

Change-Id: Ia71ff3bb499b56540291c0aa6a73906c9f4b6285