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

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

Change-Id: If2462d90aae33ac8e4d7011d79d6e213b7430d50