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

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

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