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

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

Change-Id: Ib6bfe38a012aebb34ac8a11133e94b49954b1c23