Merge changes I4c04ea40,I6e9ea0d7 into main am: 604c767a0a am: 40810bb739 am: d1293c177b

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

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