Merge changes I0e5b59b9,I6a37e397 into main am: 6af9330e67 am: 6f84b1fce9

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

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