[automerger skipped] Merge "Stop location to avoid timing issue" into android10-tests-dev am: ae13efab -s ours

am skip reason: skipped by user yuhany

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

Change-Id: Icbfed1b1ae72aeddc47851e47fb3b43173090c94