Merge changes I4a09a9f3,I7d087836,I1ae46d99,I0f0d476b into main am: 92e4b803c8 am: 6f3804146d am: 015326af1e am: 8877aafbc7

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

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