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

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

Change-Id: Ibb7be261e2151f1574ced0013790a07494ab72e5