Merge changes I1b67cc8e,I18ad7b23 into main am: 6f32f6146d am: 14f4d03296

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

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