Merge "Extend GNSS VTS 2.1 test timeout to 15min" am: 6551b1ad4b

Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/1451821

Change-Id: Ie43a8bce9947abe17177ab3fcb86a9a4759a68e6