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

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

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