Merge changes Ia449e521,Iaa6cd313 am: 97730f6caa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49f715a32c548e4f4162540f9e43c5c33e68509c