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

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

Change-Id: I7b3f578bd2e5083da9390f995b5e4daa32176172