Merge changes I58054d98,Ia493da3f am: 1f854a1785 am: 21e9d3feb8 am: bc597b9a12

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

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