Merge "Add carrier config variable to hide sim lock setting ui." into mnc-dev