am 3681f26: LocationManager:  Recover if process containing NetworkLocat

Merge commit '3681f2614fa8c10560c790f6b4287f65d6fd2663'

* commit '3681f2614fa8c10560c790f6b4287f65d6fd2663':
  LocationManager:  Recover if process containing NetworkLocation provider crashes