Merge changes I597f7405,I09b65692 am: d68b9c594e am: 5cd45d95e0

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

Change-Id: I3cc314b96f7d7dd55e09aec18997a24180434800