Merge changes from topic...

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

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



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