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

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

Change-Id: I60385baaedfc77fc5f9c9adf2bcc5a1fcd347f09