Merge "Update config.xml overlay for new key config_overlay_locationProviderPackageNames" into jb-mr1-dev