Merge "Changed logic for GNSS measurement state" into nougat-cts-dev am: 4987896713 am: f20a04735a am: 3afed964b3 am: 25830396e4 am: 62a2225424
am: a531473cbe

Change-Id: I5fac142bd023906939b369647ed69a6cb0023946