Merge changes I47894ce3,Ibc2013cf,Ide4eb89b am: 532501a256 am: 1329fe6887 am: b69fedaacf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If2289c434d7f52ef0322116403f459397454fec0