[automerger skipped] Stop location to avoid timing issue (VTS 2.0) am:...

[automerger skipped] Stop location to avoid timing issue (VTS 2.0) am: 45e3ffdb -s ours am: aca2af55 -s ours

am skip reason: skipped by user yuhany

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

Change-Id: If4b3d5362cc15f63caefea5c517be7f1d4d45ceb