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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacbff21b8e2513d2a2e87202111d011fc9d5b199