Merge changes from topic "am-016f59e51ec04ddf9a3ffc0b4e415bb9" am: 91f70e43 -s ours

am skip reason: Merged-In I55066cc1de8b820c24faccdfb469377c897e9808 with SHA-1 cf9526cf is already in history

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



Change-Id: I9c58dcc92fcec7fcb01b7d7dc529d5a146981c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>