Merge "Merge "Changed logic for GNSS measurement state" into nougat-cts-dev am: 4987896713" into nougat-mr1-cts-dev am: 44fe3cdeed am: de08199bce am: eb2b0fc4e3
am: 21d31f70bc  -s ours

Change-Id: I0133acf657c4f287538b96d8bfb02601b90b4926