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

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

Change-Id: Ifbf3004ce1602749a1b9c4529b06bdb27bfb0ad7