Merge changes from topic...

Merge changes from topic "revert-3341640-fix-b-364310317-fix-ANAPIC-comments-3-SRPURNABEL" into main am: ffbedd7f

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



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