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

am skip reason: skipped by user yuhany

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

Change-Id: I038a1486306985560d7c21e19a9d346f6425a8a1