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

Change-Id: Id3b5f15b9e7291329997bfc43ce1eb683c229fbc