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

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

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