Merge changes Ia7f3461d,I169d9f23 into main am: a3820347a9 am: 83d804d019

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

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