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

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

Change-Id: Icad6ce176d092ffccd23d83e94eef5d16d721de0