Merge "Camera VTS: remove duplicate function in anonymous namespace" into tm-dev am: 7fdc10af19 am: 4d2f04130c am: 2f64bf1ae0 am: 49a5db8063

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

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