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

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

Change-Id: I84f4a061b4bc60675b871fae85375fa655ce4f11