Merge "Resume GNSS measurement reporting when location setting is back on."