[automerger skipped] Supported synchronized fixed location and measurement...

[automerger skipped] Supported synchronized fixed location and measurement from device files am: 55c22f89 -s ours am: 31cf8964 -s ours am: c66d4d9c -s ours

am skip reason: Merged-In Ide7bbb3e81a90414496084691227bd95a2e7af18 with SHA-1 f46bb4ac is already in history

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

Change-Id: I5bc3df7df641dae5fb9a64451640e39b9574d4fb