Merge "Fix inconsistent permission check in LocationManager."