Merge changes I4c04ea40,I6e9ea0d7 into main am: 604c767a0a

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

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