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

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

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