Merge changes I39f15cc4,I9639692c,I0a10bacc am: 39c92dd8fc am: 591674d1c0 am: 81ef1c94a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ied8cddb82fde1af5df78d95e429c0b04e5dd7eff