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

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

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