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

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

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