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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I27168c44f715982c4d561a1407fb9adc09b42be7