Merge "Don't throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread