[automerger skipped] Merge "Fix GnssMeasurement state range check" am:...
[automerger skipped] Merge "Fix GnssMeasurement state range check" am: 43f1d331 am: 249b63ce -s ours am: b366abb3 -s ours am: b404e721 -s ours
am skip reason: Change-Id I72f4bf1f09d6271ac6367abc3972ee7747b18155 with SHA-1 15570c46 is in history
Change-Id: I8bc60ce5517c60d27b292f52960f126cad4ed703