Merge changes I5a0827eb,Ibd0da668,I74c71975 am: 65f7dd435d am: 47bc0dd0b9 am: 42813e6239

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I39a3f2fd4230a7a3b8fab42b0e63337f2e528ff8