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

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

Change-Id: Ib902fe5bbe8b9f2277aa4b3b01f83ea166a7b9c0