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

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

Change-Id: Ic3e3040066122702ae010bd48f5facf4548c4a23