Merge changes I47894ce3,Ibc2013cf,Ide4eb89b am: 532501a256

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2e5874f72a98cab75aa579abd0ff77ad1f398ad8