Merge "Camera: fix the VTS test timeout to be 30min" into rvc-dev am: ef7bf24010

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

Change-Id: I34243abbf06dd38bd2ab41c24abeb39bbdc983c1