Merge changes I4a6854ee,I12af66ef,I5b41cbe2 am: 3107a0bb93 am: 7f944c9c0b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I28f5324103dd01240498016174f5ac977d147200