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

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

Change-Id: I926396b9a66e3226275eef9041809aad3bb3d623