Merge "Camera: Misc VTS test fixes" into tm-dev am: 5bf813a93e am: 3010da44d2

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

Change-Id: I9b8e2dffbfffe0907a8678423ebbce953cac2688