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

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

Change-Id: If18910d53cea04b43200942e2c562efc7cf01b90