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

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

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