Merge changes from topic "fix-b-364310317-fix-ANAPIC-comments-3" into main am: 21b5e8a4

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



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