Merge "Add config parameter NFW_PROXY_APPS to CarrierConfigManager"