Merge changes from topic...

Merge changes from topic "revert-3368981-revert-3341640-fix-b-364310317-fix-ANAPIC-comments-3-SRPURNABEL-ZMHYKOWFUK" into main am: 052a553a

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



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