Merge changes I0e5b59b9,I6a37e397 into main am: 6af9330e67

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

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