[automerger skipped] Merge "Fix GnssMeasurement state range check" am: 43f1d331e3 am: 249b63ced6 -s ours am: b366abb31d -s ours

am skip reason: Change-Id I72f4bf1f09d6271ac6367abc3972ee7747b18155 with SHA-1 15570c4681 is in history

Change-Id: I7f27e80ab881c6d22b94db765bd296657d9350ae