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

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

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