automerge: e6ad5f7 * commit 'e6ad5f75fcbbe1555411fe1923d5bb07977877d7': Fix a bug where LocationManager's addGpsStatusListener does not throw a SecurityException if LocationManagerService.mGpsStatusProvider is null even when ACCESS_FINE_LOCATION permission is not present.