Merge "Camera VTS: remove duplicate function in anonymous namespace" into tm-dev am: 7fdc10af19 am: c607536abc

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/18565634

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