Merge changes I3f879fc3,Id828cef4,Ic7887d61 am: c93ffab0d3 am: 4ab211c4fd am: ed5503363a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If9a4ed9e90b53e12768a4eb331b459f7c9be1697