Merge "Allow set metered override setting for passpoint"