Merge changes I7838b1e5,I78323abe into main am: 3a5bf76a

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



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