[automerger skipped] Merge changes from topic "gnss-cherry-pick" into sc-v2-dev-plus-aosp am: 9e09a58e -s ours am: 7cc7dd13 -s ours

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

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

Change-Id: I4f40e4f9b0f1a771b7dccb80bb153a5fbbf3e688