Merge "Clarify C/No reflects the tracked portion of a GnssMeasurement" am: a39ab91dbb
am: 32526b3d8d

Change-Id: I9b5c1d3702add94ad257c3e3e73d44c61b6a3e52