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

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

Change-Id: I45b2c99642aeb4f02543cefc243f2cb3e1767f42