Merge changes Iae2b4e10,I0e97edf5,I69d529b6,I13c75cbd,I52f434be into main am: d8b9ed515d

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

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