Merge changes I37dfeabc,Ief8f90bd,Ic460b222 into main am: 841c2ac294 am: d90df8b7bc

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

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