Merge "Stop location to avoid timing issue (VTS 2.0)" into rvc-dev am: de47235b01 am: 2473c15121 am: 95eb4e7bc5 am: 56a1d0638b

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

Change-Id: I318e6184fa1175cba79a7b0dc64d57d17207aabe