Merge changes I8b15407d,I2667b6f5,I8c83c6b7 into main am: b2bcebca am:...

Merge changes I8b15407d,I2667b6f5,I8c83c6b7 into main am: b2bcebca am: 3dde652e am: a88f5d96 am: bfe49379

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



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