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

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

Change-Id: If2a14d2f027cebd35ef2003bfc549aedc0a386f6