Merge changes I8b15407d,I2667b6f5,I8c83c6b7 into main am: b2bcebca81 am: 3dde652e8e am: a88f5d96a5

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

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