Merge "cm: Add config for network location provider" into jellybean