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

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

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