[automerger skipped] Merge changes from topic "gnss" into sc-v2-dev am:...

[automerger skipped] Merge changes from topic "gnss" into sc-v2-dev am: 3870153f -s ours am: 96e84fbb -s ours am: 36de177b -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: I847bd1458a4874c319c1be7305a7098b7d8d6ed4