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

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

Change-Id: I38130f158ce6dfa88d2498a4023a11afe5edea91