Merge changes Ia449e521,Iaa6cd313 am: 97730f6caa am: 9aa4829a06 am: 23516a41e9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8e0c712b2aa46dea94186e17891fff8b6c13534d