combo issue when location reported by providers do not come with extras

LocationManagerService tries to create an extra bundle and stick it
into the location object, but it is not doing it correctly. As a
result, combo drops report.

Change-Id: I6f5886dd7f14819ecc7a4ed96c867a0ec486faf7
CRs-Fixed: 962746