Merge "Camera VTS: Fix incorrect return value check" into tm-dev am: 7ab50a866a am: 9a66549f5c am: 0b35695009

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

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