Merge changes I58054d98,Ia493da3f am: 1f854a1785

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

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